Sync'd branch central with upstream @ Mon Sep  1 22:47:30 PDT 2014