NOJIRA Comment broken piece of very legacy code
Merge branch 'master-fix' into develop

* master-fix:
  NOJIRA Comment broken piece of very legacy code

Conflicts:
	app/lib/core/Plugins/Media/Audio.php