Sync'd branch releases/aurora with upstream @ Mon Oct 20 10:21:42 PDT 2014