From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 31 May 2019 09:27:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2191dc722d5e64c9003986340b9e82a3f5bd8dfd;p=pmi.git

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	composer.json
#	composer.lock
---

2191dc722d5e64c9003986340b9e82a3f5bd8dfd