Sync'd branch releases/aurora with upstream @ Wed Aug 27 07:05:37 PDT 2014