Merge changes from lolzsec into master

lolenglish authored
revision 0f417ad65c7562722503302cba94066facdb608b