Sync'd branch releases/release with upstream @ Fri Oct 17 05:55:39 PDT 2014