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