Sync'd branch central with upstream @ Fri Sep  5 14:48:37 PDT 2014