- upstream update for cogl 1.17