Merge branch 'master' into core-updates
authorAndreas Enge <andreas@enge.fr>
Sun, 24 Jul 2016 16:42:56 +0000 (18:42 +0200)
committerAndreas Enge <andreas@enge.fr>
Sun, 24 Jul 2016 16:42:56 +0000 (18:42 +0200)
commit1abdc167d3a602e3a35374762ac1ed4d7e9f0593
tree9e1519d9302de4deab6b5730bcf5b9444cf1b5d2
parentfe7fa353201286ae1ad78511d5b5cd3fa8213b65
parente03a51530450e85f88dd36ad459f06950eb906ea
Merge branch 'master' into core-updates