Merge branch 'master' into dev
authorshahoian <ruben.shahoyan@cern.ch>
Tue, 18 Mar 2014 10:19:11 +0000 (11:19 +0100)
committershahoian <ruben.shahoyan@cern.ch>
Tue, 18 Mar 2014 10:19:11 +0000 (11:19 +0100)

Trivial merge