Merge remote-tracking branch 'refs/remotes/ivan/bug/fix-failing-tests' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 17 Jan 2014 20:52:22 +0000 (17:52 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 17 Jan 2014 20:52:22 +0000 (17:52 -0300)

Trivial merge