Merge pull request #3193 from jrgm/train-2013.03.29

bump version and updated changelog; #3153 is on this branch