Merge changes necessary to build refactored support library
1 file changed