Merged in changes from Kippo 0.8