Fixed comment on python indent
Merge remote-tracking branch 'origin/release-20131106' into release-20131106
Fixed ALPS version