Attempt a fix at an API bug
Merge branch 'master' into development