Merge branch 'develop' into debian/wheezy
authorAndrea Zagli <azagli@libero.it>
Wed, 14 Dec 2016 15:03:08 +0000 (16:03 +0100)
committerAndrea Zagli <azagli@libero.it>
Wed, 14 Dec 2016 15:03:08 +0000 (16:03 +0100)

Trivial merge