Revision 03cfa6d0a04baf63314f316b6944e57a5cad965b

Committed on 04/06/2018 10:12 am by Luca Realdi <lr@opencontent.it> [GitHub Diff]

Merge branch 'v2.x'