Merge branch 'svost-patch'
author0xDEADFACE <masmfan@gmail.com>
Sun, 18 Oct 2015 19:51:20 +0000 (12:51 -0700)
committer0xDEADFACE <masmfan@gmail.com>
Sun, 18 Oct 2015 19:51:20 +0000 (12:51 -0700)

Trivial merge