Merge branch 'master' into dev

Conflicts:
lib/compass-pattern-primer.rb
templates/shared/sass/base/forms/_forms.scss