Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Add FAQ item about Windows XP needing some extra things
Merge branch 'master' into develop