Update unvolontary modifed code by commit
b1d40035a4f4b0e67c49921cd884c52e258662fe
Merge pull request #31 from Doude/bug/1305217

Update code between branch havana and havana-R1.05