Jeff: commit test, 10/1, 17:32, OS X, Netbeans
Merge origin/master

Conflicts:
	nbproject/private/private.properties