NGWMN branch

David Watkins requested to merge wdwatkins:NGWMN into NGWMN Nov 17, 2016