Revert "Revert "Merge branch 'master' of https://github.com/Brickimedia/brickimedia""

This reverts commit b5190499561de78508c00a9a3218fc1dcad12525.