Merge branch 'feature/async-api' into develop
authorKali Kaneko <kali@leap.se>
Wed, 11 Feb 2015 18:01:20 +0000 (14:01 -0400)
committerKali Kaneko <kali@leap.se>
Wed, 11 Feb 2015 18:01:20 +0000 (14:01 -0400)

Trivial merge