Merge remote-tracking branch 'leapcode/pr/138' into develop
authorKali Kaneko <kali@leap.se>
Fri, 11 Mar 2016 19:32:40 +0000 (15:32 -0400)
committerKali Kaneko <kali@leap.se>
Fri, 11 Mar 2016 19:32:40 +0000 (15:32 -0400)

Trivial merge