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