Marius Bakke 84157bb8bf
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.
2017-03-30 22:59:53 +02:00
..
2017-01-28 18:55:20 +01:00
2017-03-18 00:38:41 +01:00
2015-01-26 21:58:12 +01:00
2016-12-14 21:58:32 +01:00
2017-01-13 14:13:01 -05:00
2015-09-04 18:31:06 +02:00
2015-01-11 23:50:01 +01:00