updated with geospike's bucket
Merge branch 'imagemagick_old' into imagemagick

Conflicts:
	lib/language_pack/ruby.rb