Merge branch 'master' into dev
authorshahoian <ruben.shahoyan@cern.ch>
Wed, 9 Apr 2014 13:51:08 +0000 (15:51 +0200)
committershahoian <ruben.shahoyan@cern.ch>
Wed, 9 Apr 2014 13:51:08 +0000 (15:51 +0200)

Trivial merge