merge: feature-acts-as-taggable -> develop