Update README.txt.
Fix #391.
Fix #309.
Fix #395.
Belt and braces for #395.
#392 work in progress.
Fix #392.
Merge remote-tracking branch 'upstream/master'