Fixed an error thrown when calling timeline.destroy() (see #294)
Merge remote-tracking branch 'origin/develop' into develop