CalledFromWrongThreadException fixup, closes #337
Merge remote-tracking branch 'remotes/upstream/master'