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