Merge branch feature/stein.pedersen/python-api with refs/heads/master into refs/merge-requests/24/train
