Sync'd branch releases/release with upstream @ Wed Oct 29 09:35:35 PDT 2014