fork of marketcetera from public svn tag 2.2.0