Update Pixmaps
Minor ifdef for Carla Embedding
Merge branch 'master-upstream'