Merge branch 'develop' into release/0.5.1 0.5.1
authorKali Kaneko (leap communications) <kali@leap.se>
Wed, 4 May 2016 21:50:06 +0000 (17:50 -0400)
committerKali Kaneko (leap communications) <kali@leap.se>
Wed, 4 May 2016 21:50:06 +0000 (17:50 -0400)

Trivial merge