Sync'd branch central with upstream @ Tue Oct 21 12:22:41 PDT 2014