Revision 782364f1d478b7a04a09cd89d4008f97e3c009a1

Committed on 25/02/2016 3:56 am by Mathieu Santo Stefano--Féron <msantostefano@jolicode.com> [GitHub Diff]

Merge branch 'master' into simplify-config