Merge branch 'avidenic-master'
authorNik Okuntseff <support@anuko.com>
Mon, 18 Jul 2016 17:32:00 +0000 (17:32 +0000)
committerNik Okuntseff <support@anuko.com>
Mon, 18 Jul 2016 17:32:00 +0000 (17:32 +0000)

Trivial merge