Sync'd branch releases/aurora with upstream @ Mon Oct 20 12:00:39 PDT 2014