Improve sugar_test_variable_not_empty
Merge branch 'update' into update.macosx