Merge pull request #6537 from Slonegg:opeeni2_multiple_devices
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 31 May 2016 10:35:44 +0000 (10:35 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 31 May 2016 10:35:44 +0000 (10:35 +0000)

Trivial merge