synchronization with auth branch
Merge branch 'master' into ice-cream-sandwich
fixed possible NPE
Merge branch 'master' into ice-cream-sandwich