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