Merge branch 'release/2012-11-07'
Merge branch 'release/2012_11_10'
slimak
Merge branch 'master' into develop