From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 25 Sep 2017 13:53:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into bookedges
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=de7538df4b580b436ea14c1d94af2c6e593ec654;p=fluidbook-html5.git

Merge remote-tracking branch 'origin/master' into bookedges
---

de7538df4b580b436ea14c1d94af2c6e593ec654