Merge remote-tracking branch 'fisher/master'

Conflicts:
	src/yalinka.app.in