Synchronized with grunt-eiffel 0.4.2