Version bump
Don't force local = TRUE. Fixes #328
Merge remote-tracking branch 'upstream/master'

Conflicts resolved in:
	NEWS