Sync'd branch releases/aurora with upstream @ Wed Oct 29 07:08:48 PDT 2014