Merging branch/2013-05-01/keyword-arguments to pick up keyword arguments for object formats.