Sync'd branch central with upstream @ Tue Sep 23 14:19:35 PDT 2014