brought from master
Merge branch 'media' of https://github.com/ging/lynckia into media
Merge branch 'media' of https://github.com/ging/lynckia into media
Merge branch 'media' of https://github.com/ging/lynckia into media
Updated chrome versions
Merge branch 'media' of https://github.com/ging/lynckia into media