Sync'd branch central with upstream @ Tue Oct 21 18:52:41 PDT 2014