..
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/com/org/foo/SikuliResourceChangeTest.java
..