Added support for merging sql files among other changes