Merge "Allow adding of context-based LESS Variables"