menu behavior change
Merge remote-tracking branch 'upstream/master'
Merge pull request #150 from jpecht/master

menu behavior