Merge branch 'master' into develop
Documentation automatic snapshot - 16:25:59 19/08/2014
Merge branch 'develop'