Merge branch 'master' into master
authorBertrone Matteo <m.bertrone@gmail.com>
Sat, 6 Feb 2016 17:04:47 +0000 (18:04 +0100)
committerBertrone Matteo <m.bertrone@gmail.com>
Sat, 6 Feb 2016 17:04:47 +0000 (18:04 +0100)

Trivial merge