Running the proper grunt stuff.
Merge