Merge remote-tracking branch 'upstream/master'

Conflicts:
	spec/models/entrance/date_spec.rb