Maven project
UTF-8
Merge commit 'f57457b2cea7bd49fe76b4007f36742c48753a35' into HEAD