Merge remote-tracking branch 'upstream/master'

Conflicts:
	omicron-core/src/main/java/com/lyndir/omicron/api/controller/MobilityModule.java