Olives: Update Olives and Emily to latest 1.x versions
Merge pull request #1075 from podefr/master

fix #1071: Olives: Update Olives and Emily to latest 1.x versions