Merge branch 'master' into Spike29/tutorial_visuals
authorYannick Le Guen <leguen.yannick@gmail.com>
Sat, 2 Dec 2017 11:17:16 +0000 (12:17 +0100)
committerYannick Le Guen <leguen.yannick@gmail.com>
Sat, 2 Dec 2017 11:17:16 +0000 (12:17 +0100)

Trivial merge