Merge branch 'master' of github.com:h5p/h5p-timeline
Bump patch version
Resolve conflicts