Sync'd branch releases/release with upstream @ Wed Oct 22 12:30:34 PDT 2014