Updates for week 20 of 2015

Detailed Merges for May 9 - 15, 2015