arrow box adjustment
Merge remote-tracking branch 'upstream/master'
various
Merge pull request #209 from jpecht/master

various