Merge remote-tracking branch 'origin/master'

Conflicts:
	src/robot-story.php
Merge remote-tracking branch 'origin/master'