Merge master back in superbuild