Updated to 0.96 upstream release