Merge pull request #1 from matthesrieke/master

Merge master back into 52North after merging WPS-3.1.0-maintenance