Should fix #350.
Bump version to RC1.
Merge remote-tracking branch 'upstream/master'