Merge branch 'master' into Meera

Conflicts:
	.DS_Store