Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into release/1.3.0
# Conflicts: # pom.xml
- Loading branch information
# Conflicts: # pom.xml