Actually merge maps instead of just concatenating#578

robocoder merged 1 commit intoleafo:masterleafo/scssphp:masterfrom

s7eph4n:map_merges7eph4n/scssphp:map_mergeCopy head branch name to clipboard