single not double quote
Merge branch 'motd_timestamp_attribute'

Conflicts:
	metadata.rb