fix content_for
Merge branch 'master' into 1-2-stable
Author info in gemspec
Merge branch 'master' into 1-2-stable