v1.5

Using the wonderful git-magic that is "cherrypicking", I selected a small list of commits from v2 that shouldn't require much discussion to merge. After these are merged, we can rebase v2 and work on the remaining features.