issue #735
Merge branch 'hotfixes' into develop

Conflicts:
	oc-includes/osclass/ItemActions.php