Changes to 'refs/tags/smartpm-0.4-1'