Merge pull request #1112 from BVLC/next

Next: release candidate