Sync'd branch releases/aurora with upstream @ Mon Oct  6 05:38:42 PDT 2014