Merge branch 'master' into pam-progress

Conflicts:
	.DS_Store