manually had to merge latest version of master into info_type_decorator because

because kenneth had already merged most of it into here before i
changed it again so my changes basically were ahead of the master and
would have overridden the current master when merging!!