Merge commit '024557b2afdbe2e946d2cc557cb71492d87b0f62' into tgunn-mncvtdev-to-master-2015-12-04

Change-Id: I156930f72a3267b59123469231331e9da5ac6aab