synch (30-11-13)
Merge branch 'master' of https://github.com/gitcomfo/ripd.git