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)
commit3e9ed5ac757daba3018c2827ff7d0f89688af77c
treedf8efa641a6ba87db157fbe79629df17969a0de1
parentd21747140748a6da8426024aa86b0acfe6524e75
parentfb45e2e0335bf86e7d84f59df79d1f2054ad2550
Merge remote-tracking branch 'origin'

Need to merge so I can push.