Merge branch 'release/v0.4.25' into develop
too late at night
Merge branch 'release/v0.4.26'

Conflicts:
	Model/Pause.php