merge diff from 2014 April 10 - 16