Keeping up to date with grunt branch