1.9.5.4
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml