Merge commit '6cb5fcaad143227002bd4d00b1974e126d9a8090' into tgunn-mncvtdev-to-master-2015-12-04