Merge remote-tracking branch 'origin/master' into mikhail.golubev/py-attribute-inference