Fix incorrect parsing of temporary elements
Merge branch 'develop' into gh-pages