Sync'd branch releases/aurora with upstream @ Thu Sep 11 13:26:37 PDT 2014