Merge branch 'aurium-master'
authorSergey M․ <dstftw@gmail.com>
Sat, 11 Jul 2015 16:59:18 +0000 (22:59 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 11 Jul 2015 16:59:18 +0000 (22:59 +0600)

Trivial merge