Merge branch 'feature-malturan'
authordberzano <dario.berzano@cern.ch>
Wed, 11 Feb 2015 16:22:41 +0000 (17:22 +0100)
committerdberzano <dario.berzano@cern.ch>
Wed, 11 Feb 2015 16:22:41 +0000 (17:22 +0100)

Trivial merge