Merge branch 'jorams-dumpert'
authorSergey M․ <dstftw@gmail.com>
Mon, 30 Mar 2015 14:12:09 +0000 (20:12 +0600)
committerSergey M․ <dstftw@gmail.com>
Mon, 30 Mar 2015 14:12:09 +0000 (20:12 +0600)

Trivial merge