Merge branch 'microformats' into 'develop'