Revision 40f8265cabb2b91ef2643dc96bae8a7a7b9250b7

Committed on 07/12/2016 12:42 am by Petar Å panja <petar@spanja.info> [GitHub Diff]

Merge branch '1.1'