0.9.5: Merge of dispatcher bugfix