Use byebug instead of debugger for ruby 2.x support
Merge branch 'master' into 4.1.1-wip

Conflicts:
	Gemfile.lock