[skip ci] Merge branch 'master' into dev

Conflicts:
	src/java/diff_stats_t.java
[skip ci] Merge branch 'dev' of github.com:nroza/grey-duck into dev