Commit 917f85a1a4616a93fcbba30c82caff9c1c011b83

Arthur Schreiber 2014-10-09T14:16:10

Extract shared functionality.