4.11.18
Merge remote-tracking branch 'origin/master'

Conflicts:
	Norwegian/main/AuthManager.apk/res/values-nb/strings.xml