issue #1239
Merge branch 'hfix' into conejoninja-hfix

Conflicts:
	oc-includes/osclass/model/Field.php
Merge pull request #1289 from conejoninja/conejoninja-hfix

Conejoninja hfix
Merge pull request #1290 from osclass/hotfixes

Hotfixes