Merge branch 'dev' of https://github.com/BVLC/caffe into dev
Merge branch 'dev' of https://github.com/eendebakpt/caffe into dev