Sync'd branch releases/release with upstream @ Mon Oct  6 10:50:51 PDT 2014