Updates for Week 11 of 2017

Detailed Merges for Mar 13 to 19, 2017

on github