Merge branch 'master' into gltf_o3dgc
authorAlexandr Arutjunov <smal.root@gmail.com>
Sat, 10 Sep 2016 06:14:40 +0000 (09:14 +0300)
committerAlexandr Arutjunov <smal.root@gmail.com>
Sat, 10 Sep 2016 06:14:40 +0000 (09:14 +0300)

Trivial merge