synchronization with auth branch
Merge branch 'master' into nook
fixed possible NPE
Merge branch 'master' into nook