Merge branch 'bug/tests-dont-pass' into develop
authordrebs <drebs@leap.se>
Tue, 29 Jul 2014 19:09:48 +0000 (16:09 -0300)
committerdrebs <drebs@leap.se>
Tue, 29 Jul 2014 19:09:48 +0000 (16:09 -0300)

Trivial merge