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

Change-Id: Ia0b6529e06e5f2a9c3c1bb49dd31870df7d4cea0


Trivial merge