Merge remote-tracking branch 'remotes/kalikaneko/bug/include_properties' into develop
authordrebs <drebs@leap.se>
Mon, 6 Jan 2014 16:57:31 +0000 (14:57 -0200)
committerdrebs <drebs@leap.se>
Mon, 6 Jan 2014 16:57:31 +0000 (14:57 -0200)

Trivial merge