Merging branch/2013-05-01/keyword-arguments back to master.