ade96f1 Merge pull request #231 from BVLC/next