Commit 979645a7195b8ce9895c18ee00c8913ea38f93eb

Edward Thomson 2014-10-04T20:17:26

rebase: updates based on PR comments