Sync'd branch releases/aurora with upstream @ Wed Oct 22 18:30:43 PDT 2014