Merge branch 'master' into debian/wheezy
authorAndrea Zagli <azagli@libero.it>
Wed, 14 Dec 2016 17:54:50 +0000 (18:54 +0100)
committerAndrea Zagli <azagli@libero.it>
Wed, 14 Dec 2016 17:54:50 +0000 (18:54 +0100)

Trivial merge