Revert "Revert 5b2d0dd..46018fd"

This reverts commit 83772b91d6b25e0c38def5560b3a2dc7df238042.
Revert "merge branch 'master'"

This reverts commit 5b2d0ddd470f96b2f083d1d6e54acb49b4916874.
Revert "Merge branch 'master' into test-john"

This reverts commit c06b62d40c9abd1ee192e86fc662836d28b8b7a5, reversing
changes made to 9c1c02e33693647408f79ed72777477f698c4b35.
problem with merging branches solved

merged branch “master” into “test-john”
master branch merged at commit:
c1bf6206d5f8cc68ef2d81a0fc3629a0ab333b17