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