cotire 1.3.4
merged in sakra's fixes and changed some resulting notes