added requested stuff#10

Steareth-4 wants to merge 2 commits intojfarbowitz:masterjfarbowitz/media_alps:masterfrom

Steareth-4:masterSteareth-4/media_alps:masterCopy head branch name to clipboard