Merge branch 'master' into develop
Merge remote-tracking branch 'origin/hotfix' into develop
Case 3194 - Fixed undefined index notice, reviewed coding standards.
Merge branch 'case-3194' into develop

* case-3194:
  Case 3194 - Fixed undefined index notice, reviewed coding standards.
Merge branch 'develop'