QCon 2014.10.18
Merge pull request #1 from evilcos/master

QCon 2014.10.18