8a6bfda: Updating to April 25, 2014 changes8a6bfda: Updating to April 25, 2014 changes