slides don't need sequential ids
Merge branch 'master' into controls