Commit 15b78b3c authored Sep 24, 2019 by Marcelo Rivera

Merge remote-tracking branch 'upstream/master' into epic/minds-pro

# Conflicts:
#	Core/Router.php