Fixed in master in 851e44a9eb35a9904181ae28be0d5571768d9b23 and 5a583c4f7e9e1788a9d387ca711ed7ce780c24ff.
Fixed in master in 851e44a9eb35a99 04181ae28be0d55 71768d9b23 and 5a583c4f7e9e178 8a9d387ca711ed7 ce780c24ff.