Merge branch 'master' into dev
authorshahoian <ruben.shahoyan@cern.ch>
Wed, 12 Mar 2014 17:26:52 +0000 (18:26 +0100)
committershahoian <ruben.shahoyan@cern.ch>
Wed, 12 Mar 2014 17:26:52 +0000 (18:26 +0100)

Trivial merge