Fix bug introduced by upgrading jQuery.
Merge branch 'development' into branch/persistence-loadinstance