Sync'd branch releases/aurora with upstream @ Wed Aug 27 13:25:33 PDT 2014