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