Sync'd branch releases/aurora with upstream @ Wed Oct 22 16:07:44 PDT 2014