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