Merge branch '1.2'

Authored by mwolff.

Description

Merge branch '1.2'

Merged Changes

CommitAuthorDetailsCommitted
a49020aa5c41mwolff
use documentSave instead of plain save, since the former asks the user for a… 
Mar 17 2011