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