Sync'd branch central with upstream @ Tue Oct  7 12:42:41 PDT 2014