undoing all fb-like fixes a moment.
Merge branch 'develop' into gh-pages