version 3.1.2

Conflicts:
	oc-includes/osclass/upgrade-funcs.php