Bug fix for undefined references

Fix for issues when `offset` isn't a option but then references `left` and `top` below.
Merge remote-tracking branch 'upstream/master'