Merge remote branch 'nschum/fix-argument-type' into master

Signed-off-by: Kevin Cai <kevinc@mozy.com>