Merge remote-tracking branch 'chiiph-github/bug/ensure_server_async' into develop
authorKali Kaneko <kali@leap.se>
Wed, 14 Aug 2013 20:35:45 +0000 (22:35 +0200)
committerKali Kaneko <kali@leap.se>
Wed, 14 Aug 2013 20:35:45 +0000 (22:35 +0200)

Trivial merge