ruflin/Elastica — pull request #629 by nik9000 (2014-06-05 17:51:19+00:00)
Title: Merge some of update by document and script

These share many of the same options so it makes sense to merge them.

Closes #628
Closes #627