Ups. Sorry - I forgot to add one file to git index. Corrected patch
attached.