20140325 release fixes

This branch contains the fixes required for 20140325 release.