Merge branch 'develop'
Documentation automatic snapshot - 11:06:10 22/08/2014
Merge branch 'master' into develop