Sync'd branch central with upstream @ Sun Oct 12 11:51:37 PDT 2014