Media fix
Merge branch 'devel' of https://github.com/faldy/propertibtn into devel