Merge branch 'master' into translation
authorJean-Charles Malahieude <lilyfan@orange.fr>
Sun, 19 Feb 2017 12:23:26 +0000 (13:23 +0100)
committerJean-Charles Malahieude <lilyfan@orange.fr>
Sun, 19 Feb 2017 12:23:26 +0000 (13:23 +0100)

Trivial merge