0.3.5.20-01-2014
Merge branch 'master' into develop