Merge remote-tracking branch 'origin/master'

Conflicts:
	HISTORY.rst
3 jobs for v0.3.1 in 1 minute and 10 seconds (queued for 3 minutes and 40 seconds)
latest