Sync'd branch releases/aurora with upstream @ Mon Oct 20 09:23:43 PDT 2014