Sync'd branch releases/aurora with upstream @ Mon Oct 13 11:02:39 PDT 2014