Revision 2d064a879c26104ea29a4057c832d5986411b856

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

Merge branch '1.1'