Sync'd branch releases/release with upstream @ Sat Oct 11 01:29:33 PDT 2014