Merge branch 'master' of /home/kudiaborm/PycharmProjects/emaya with conflicts.
Merge branch 'master' of /home/kudiaborm/PycharmProjects/emaya with conflicts.

(cherry picked from commit d6ab3f1aa8d34abfdb052b4507b425ebf8f70a62)

Conflicts:
	__init__.py
	_core/_scene.py