From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 15 Sep 2017 10:11:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into bookedges
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e99c9faf54504035b9c1fdea6d4a882dd2b52704;p=fluidbook-html5.git

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

e99c9faf54504035b9c1fdea6d4a882dd2b52704