oops, we cannot be sure that the stash actually exists; access stash properly!
Merge branch 'topic/undef_stash' into develop