Sync'd branch central with upstream @ Tue Oct 28 19:09:42 PDT 2014