Update to the latest that we've tested

Authored by khandpur on May 5 2017, 12:48 AM.