merge wordpress-subdir, close #19