v0.4.0-20140110
Merge branch 'release-0.4.0-20140110'