Merge branch 'master' into master

This commit is contained in:
Akolzin Dmitry 2017-06-26 11:35:24 +02:00 committed by GitHub
commit 0aff088a69