Merge commit '1870d34ce34ad331d7038c5be37d05b93dd25f4a' into tgunn-mncvtdev-to-master-2015-12-04