Merge remote-tracking branch 'origin'
authortomnor <tomasn@kth.se>
Wed, 3 Feb 2016 21:43:52 +0000 (22:43 +0100)
committertomnor <tomasn@kth.se>
Wed, 3 Feb 2016 21:43:52 +0000 (22:43 +0100)
Need to merge so I can push.


Trivial merge