AstraLuma Merge branch 'upstream-1.1'