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