Merge branch 'master' into dev
authorshahoian <ruben.shahoyan@cern.ch>
Fri, 14 Mar 2014 20:59:10 +0000 (21:59 +0100)
committershahoian <ruben.shahoyan@cern.ch>
Fri, 14 Mar 2014 20:59:10 +0000 (21:59 +0100)

Trivial merge