tree 1ae2c3ea6a64bbf85f2d9cd7ef04b90f2ab19acc
parent 605797dab5d2142a81ee40780f96894d701adb43
parent 026f8f139b73e796a9a3de2f94d93a7cefe96876
author David M. Johnson <snoopdave@apache.org> 1569097024 -0400
committer David M. Johnson <snoopdave@apache.org> 1569097024 -0400

Merge branch 'master' into roller-6.0.x

# Conflicts:
#	LICENSE.txt
#	NOTICE.txt