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