Merge branch 'master' into gltf_o3dgc
authorAlexandr Arutjunov <smal.root@gmail.com>
Tue, 13 Sep 2016 09:08:51 +0000 (12:08 +0300)
committerAlexandr Arutjunov <smal.root@gmail.com>
Tue, 13 Sep 2016 09:08:51 +0000 (12:08 +0300)

Trivial merge