bug fix for syncho issues

author: nhhughes
Random merge problem

author: nhhughes

Merge branch 'hotfixes-shark-tank' of http://github.com/SixAppeal/wpi-suite into hotfixes-shark-tank