tree 0f6b0095f43c0564202bd57373d7b2aa0b9439df
parent ed48b479acea0fbee79c5ac1fcc0380d150cd06d
parent d456d54200e7c747ef0312ca190c2a15433b6b3d
author Dave Johnson <snoopdave@gmail.com> 1548113206 -0500
committer Dave Johnson <snoopdave@gmail.com> 1548113206 -0500

Merge branch 'master' into java11

# Conflicts:
#	app/pom.xml
#	pom.xml