Sync'd branch releases/release with upstream @ Mon Oct  6 11:13:26 PDT 2014