BugFix: Missing global $post var
Merge branch 'develop'