Revision 38e93ec3dbfa83c8e7043df5163cd1551b89954f

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

Merge branch '1.1'