Cross merge fixes from Boris#90

thatguymike merged 1 commit intoNVIDIA:caffe-0.14NVIDIA/caffe:caffe-0.14from

thatguymike:boris_cub_mergethatguymike/caffe:boris_cub_mergeCopy head branch name to clipboard