3 commits

Author	SHA1	Message	Date
kaetemi	4eb9d884d0	Merge with develop	2016-03-10 12:09:18 +01:00
kervala	794b91022e	Merge with develop	2016-03-05 11:51:08 +01:00
kervala	16cacef922	Merge with develop	2016-02-20 19:57:43 +01:00