Fixed typo.
merge master for cap and redis and log release
updates to the cap file
merge in production