small fixes
small fixes
Merge branch 'release/v0.4.54'

Conflicts:
	Model/Pause.php