merge: ffdiaporama #79