Merge branch 'issue43_unstablefps' into develop
authorStefanos A <stapostol@gmail.com>
Tue, 14 Jan 2014 13:21:19 +0000 (14:21 +0100)
committerStefanos A <stapostol@gmail.com>
Tue, 14 Jan 2014 13:21:19 +0000 (14:21 +0100)

Trivial merge