Merge branch 'master' into import_x3d
authorAlexandr Arutjunov <smal.root@gmail.com>
Sun, 2 Oct 2016 14:31:44 +0000 (17:31 +0300)
committerAlexandr Arutjunov <smal.root@gmail.com>
Sun, 2 Oct 2016 14:31:44 +0000 (17:31 +0300)

Trivial merge