Merge branch 'mgax-patch-1'
authorAndrew Karpow <andy@ndyk.de>
Tue, 21 Jan 2014 00:06:05 +0000 (01:06 +0100)
committerAndrew Karpow <andy@ndyk.de>
Tue, 21 Jan 2014 00:06:05 +0000 (01:06 +0100)

Trivial merge