Monaco Regression commit 1
Merge branch 'monaco_dev' into monaco

Conflicts:
	.gitignore