Merge remote-tracking branch 'origin/master'
authorTomas <tomasn@kth.se>
Sun, 6 Mar 2016 20:16:10 +0000 (21:16 +0100)
committerTomas <tomasn@kth.se>
Sun, 6 Mar 2016 20:16:10 +0000 (21:16 +0100)

Trivial merge