Respect SystemTypes if defined

Created by  Eelco Dolstra  on March 5, 2013
RNNLIVYYCD6HQTY6WSKOYJ6FTWY7SFLZAZ42IEQM3JFWP3GOYQMQC
Change contents