Merge branch 'master' into dev
authorshahoian <ruben.shahoyan@cern.ch>
Mon, 31 Mar 2014 10:22:13 +0000 (12:22 +0200)
committershahoian <ruben.shahoyan@cern.ch>
Mon, 31 Mar 2014 10:22:13 +0000 (12:22 +0200)

Trivial merge