Merge branch 'batch-20'
authorTim Otten <totten@civicrm.org>
Tue, 20 Jan 2015 00:14:01 +0000 (16:14 -0800)
committerTim Otten <totten@civicrm.org>
Tue, 20 Jan 2015 00:14:01 +0000 (16:14 -0800)

Trivial merge