ensure $post is set before calling maps loader
Merge branch 'bug/postid' into dev