[201410201730master]
Merge branch 'master' into branch2

Conflicts:
	20141020.txt