Sync'd branch releases/release with upstream @ Fri Oct 17 08:29:35 PDT 2014