Sync'd branch releases/aurora with upstream @ Fri Aug 29 13:32:35 PDT 2014