Merge pull request #7242 from bkuhls:asm
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 7 Sep 2016 09:09:29 +0000 (09:09 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 7 Sep 2016 09:09:29 +0000 (09:09 +0000)

Trivial merge