Sync'd branch releases/aurora with upstream @ Mon Oct 13 06:25:46 PDT 2014