Merge remote-tracking branch 'origin/master'
root [Wed, 6 May 2015 17:48:17 +0000 (19:48 +0200)]

Trivial merge