Merge branch 'release/3.1.1-CMPY-07292014' into develop
Merge branch 'release/3.1.1-CMPLY-07292014'