Merge branch 'master' of github.com:smurav/db13-14 into 1