#336 work in progress.
#336 work in progress.
Fix #336 - I hope!
Attempt at #342.
Merge remote-tracking branch 'upstream/master'