using dojo 1.8.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	rfe.htm
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
using dojo 1.8.3