Undo #23, as Apple reverted changes :-/
Merge branch 'develop'