Version 1.5 (Build 31) 2013-05-27
	Comment out unused line that was producing error (uid).
Merge branch 'develop'