Merge branch release-5-1
commit112241dea82b19d0a265556bd554fd8a84b60ded
authorErik Lindahl <erik@kth.se>
Sun, 26 Jul 2015 17:32:49 +0000 (26 19:32 +0200)
committerErik Lindahl <erik@kth.se>
Sun, 26 Jul 2015 17:39:07 +0000 (26 19:39 +0200)
tree9f0db1d74852b50876c205761cde795ff060df47
parent86f86f19d985cd5516b5f8bd5d3dab4760d4b573
parent203fb41e50e3681e1eba0e858f493a0856423733
Merge branch release-5-1

No conflicts.

Change-Id: Ia0b6529e06e5f2a9c3c1bb49dd31870df7d4cea0