Merge branch 'parse_special_comment' into movabletype-develop
Merge branch 'regexp_attributes_filter' into movabletype-develop