Merge remote-tracking branch 'origin/master' into drone

Conflicts:
	tp.gemspec