Merge remote-tracking branch 'origin/master'

Conflicts:
	utility/src/_Rfunctions/amchelpers.r