Merge branch 'master' of github.com:ETegro/astor2-rrdd