Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Andy Wilkinson 2019-03-26 12:46:07 +00:00
commit 139739ccd9

View File

@ -1,7 +1,7 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
https://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION