All tests passing for TRN-328
Merge pull request #108 from iParadigms/TRN-328

All tests passing for TRN-328
Merge branch 'master' into PageControl