Fix #800 (and add error msg in a nasty catch and ignore)
Merge branch 'master' into zmqFix

Conflicts:
	Android/build.gradle
Merge pull request #814 from arthurbenemann/zmqFix

Fix #800 (and add error msg in a nasty catch and ignore)