reverting merge in f516076b976e93395463841a099a7f379d11c31b, it might have been corrupt, we'll see soon :D
another try... merging 5d637f02835da6cede3ca335f4031089c0132b62 to f3ec6cdd5481959241ec56e5e99773b7c10be145 (from 1.0)