Sync'd branch releases/aurora with upstream @ Wed Oct 29 11:20:30 PDT 2014