added back fb-like offset fix (i hope, again)
Merge branch 'develop' into gh-pages