Merge branch 'master' into 162

Conflicts:
	sites/all/modules/custom/idevels/idevels.module
Merge branch '162' into test