Updating submodule pointers
Merge remote-tracking branch 'upstream/unstable' into 230_release
Merge pull request #80 from khawkins/230_release

Merging unstable into master, for 2.3 release
Merging master back to unstable
Merge pull request #81 from khawkins/unstable

Merging master back to unstable