Sync'd branch releases/aurora with upstream @ Thu Sep 18 03:36:36 PDT 2014