Merge remote-tracking branch 'leapcode/pr/14' into develop
authorKali Kaneko <kali@leap.se>
Fri, 16 Jan 2015 16:22:37 +0000 (12:22 -0400)
committerKali Kaneko <kali@leap.se>
Fri, 16 Jan 2015 16:22:37 +0000 (12:22 -0400)

Trivial merge