Merge in all core changes from HoneyDo.es