Merge from pkyeck:master