Sync'd branch releases/release with upstream @ Mon Oct  6 05:54:34 PDT 2014