Caught up 2013.04 with 2013.02 bugfixes
Merge pull request #36 from timf/2013.04cu

Caught up 2013.04 with 2013.02 bugfixes