Nil-checking: don't look for OG logo if no logo
Merge branch 'refs/heads/master' into production