v0.14.39
Merge remote-tracking branch 'origin/master'

Conflicts:
	article.php
	db.php