Prevent <object> elements from stretching page
Merge branch 'dev'