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