Merge branch 'master' into gsoc_breadboard

diff --cc lib/Catalyst.pm
Simple merge

diff --cc lib/Catalyst/Component.pm
Simple merge

diff --cc lib/Catalyst/Utils.pm
Simple merge