Merge with develop
authorMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Fri, 17 Oct 2014 09:06:30 +0000 (11:06 +0200)
committerMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Fri, 17 Oct 2014 09:06:30 +0000 (11:06 +0200)

No differences found