FCTWO-197 Bugfix
Merge branch 'master' of https://github.com/pixelpark/ppnet