Marius Bakke 84157bb8bf
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.
2017-03-30 22:59:53 +02:00
..
2017-01-26 13:49:56 +01:00
2015-11-26 22:35:01 +01:00
2015-10-19 10:10:47 +02:00
2016-09-01 13:40:49 +03:00
2016-09-05 00:06:47 +02:00
2017-03-18 00:39:49 +01:00