Fixed merge of pull req for 86433a4