Merge branch 'origin/master'

Conflicts:
	lib/sylrplm_ext.rb
	sylrplm_ext.gemspec