Sync'd branch releases/release with upstream @ Fri Oct 17 06:21:34 PDT 2014