Changes to 'refs/tags/smartpm-0.2-4'