Sync'd branch releases/aurora with upstream @ Wed Oct 29 15:21:35 PDT 2014