Merge pull request #1746 from ether/develop

Bring in latest fixes.  No flow included, too much headache.
Merge pull request #1747 from ether/develop

Stop latest Express breaking things
Merge branch 'release/1.2.11'
Update README.md
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	README.md