Merged branch 'master' into branch 'server'.