Sync'd branch releases/aurora with upstream @ Fri Oct 10 16:07:29 PDT 2014