Tweaks needed for Macademia. Some are blatant hacks.
Merge remote-tracking branch 'origin/sr' into sr

Conflicts:
	wikAPIdia-loader/pom.xml