fixed possible NPE
Merge branch 'master' into tags-master
updated ChangeLog
Merge branch 'master' into tags-master