Merging changes from Vistaprint svn since this was forked