Merge branch 'release/3.1.1-CMPLY-05272014-2' into develop
Compiled v3.1.1-CMPLY-05272014-2
Merge branch 'release/3.1.1-CMPLY-05272014-2'