Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Tue, 28 Oct 2014 23:52:31 +0000 (00:52 +0100)
committermivanov <marian.ivanov@cern.ch>
Tue, 28 Oct 2014 23:52:31 +0000 (00:52 +0100)

Trivial merge