~wizardpen-devs/wizardpen/trunk

6 by Martin Owens
Get branch up to date.
1
License would be here, but devs forgot to put it here.