Merge pull request #480 from Fatsie/liberty_value_expression