3 commits

Author	SHA1	Message	Date
kervala	7879ca7566	Merge with develop	2016-01-02 20:29:55 +01:00
kervala	1354d99609	Merge with develop	2016-01-02 17:11:59 +01:00
kervala	83f8502b51	Merge with develop	2016-01-01 16:27:45 +01:00