Merge branch 'akallabeth-fix_2036'
authorMartin Fleisz <martin.fleisz@thincast.com>
Thu, 11 Sep 2014 11:03:36 +0000 (13:03 +0200)
committerMartin Fleisz <martin.fleisz@thincast.com>
Thu, 11 Sep 2014 11:03:36 +0000 (13:03 +0200)

Trivial merge