Use <figure> and <figurecaption> for slides
Merge in latest develop