properly calculate offsets for non-default view modes (closes #770)
bump version, use shorter version
Merge remote-tracking branch 'upstream/master'