Sync'd branch releases/release with upstream @ Fri Oct 10 12:59:33 PDT 2014