Revision 60ccaead183291a30dc6276af5189e065dc288a9

Committed on 12/06/2017 2:17 am by Jérôme Vieilledent <lolautruche@gmail.com> [GitHub Diff]

Merge branch '1.1'