Moved korma/lobos back to master branch