Update regression branch

from the BVLC/caffe