Commit f389ecb89acb7f51b6a9e8f41ebad3e45ac905a2

Mathieu Lirzin 2017-08-31T19:23:42

Merge branch 'minor'