Merge "Put cronjobs in order"