Merge branch 'fix/158-rply-expr' into develop

Conflicts:
	R/rdply.r