Sync'd branch central with upstream @ Sat Oct 25 03:21:12 PDT 2014