Sync'd branch releases/aurora with upstream @ Wed Oct 29 14:12:36 PDT 2014