Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Mon, 26 May 2014 12:35:38 +0000 (14:35 +0200)
committermivanov <marian.ivanov@cern.ch>
Mon, 26 May 2014 12:35:38 +0000 (14:35 +0200)

Trivial merge