stash apply
merged from master