another update
Merge branch 'master' into fixes

Conflicts:
	2014-09-11/tmtw20140911.md