Sync'd branch releases/release with upstream @ Fri Oct 10 09:15:32 PDT 2014