#647 only appeared after 3.0.3 and #648 is so minor it doesn't need mentioning