Update from  torchbox:master on 2014-09-16