end of day 2013-10-08
Merge branch 'master' of https://github.com/preinh/rsb