Hacks to merge with Sergey
Merge branch 'master' of https://github.com/fmassa/torch-nn