Merge branches 'master' and 'mob' of http://repo.or.cz/r/scuttle