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