fixed possible NPE
Merge branch 'master' into beta
updated ChangeLog
Merge branch 'master' into beta