Sync'd branch releases/aurora with upstream @ Wed Aug 27 11:41:32 PDT 2014