Sync'd branch releases/aurora with upstream @ Mon Oct 20 11:06:39 PDT 2014