Sync'd branch releases/release with upstream @ Fri Oct 10 11:49:30 PDT 2014