Merge from kripken/master