Merge origin/master

Conflicts:
	src/styler/Styler.java