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