Merge pull request #816 from dmatej/maven

Fixed issues reported by maven when we tried to deploy a pre-release