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