Merge commit 'trenkel/st/python'