Merge branch 'master' into dev
authorshahoian <ruben.shahoyan@cern.ch>
Mon, 17 Mar 2014 11:56:23 +0000 (12:56 +0100)
committershahoian <ruben.shahoyan@cern.ch>
Mon, 17 Mar 2014 11:56:23 +0000 (12:56 +0100)

Trivial merge