merging in anonmeiser's mvn_plus into my Master