Merge remote-tracking branch 'github/mac-book-pro' into trophy-mard0118
Fix access to null pointer
Enter Makefile directory before calling make
Fix incorrect initialization of buffer indent/tab size
Merge remote-tracking branch 'origin/trophy-mard0118' into mac-book-pro
Hide make variables names in combo boxes