Update from upstream elementary commit f8919f2fc95a22fc6ef06d2715570e4fcb023c59 (release: v1.10.0 beta 1'
Pull latest upstream terminology corrosponds to 5680e5a827ebc0dbf41301ffe6838b43c959d9be