added upper bound for lens, since 4.4 splits off aeson-lens
merged from master, resolved conflicts