first shot on issue #28.
Merge remote-tracking branch 'origin/stable/folsom' into stable/folsom