fix nullable media fields
Fix py26 failure
Changelog update for #460
Merge branch 'aikoven-develop' into develop