Merge of 'master' into mangos.