Merge branch 'master'

Conflicts:
single.php