Sync'd branch releases/aurora with upstream @ Mon Oct  6 20:17:46 PDT 2014