Sync'd branch central with upstream @ Tue Oct 21 11:50:40 PDT 2014