Merge remote-tracking branch 'origin/trophy-mard0118' into mac-book-pro
Hide make variables names in combo boxes
Merge remote-tracking branch 'github/mac-book-pro' into trophy-mard0118
Preserve previous label text
Add more variables in Makefile sample