Merge branch 'master' into master

This commit is contained in:
Akolzin Dmitry 2017-07-28 09:45:06 +02:00 committed by GitHub
commit fec2c3495c