Merge pull request #229 from mballance-sf/master

Updates for 1.2.9 release
""
""
""
Resolve conflicts
Merge remote-tracking branch 'upstream/master'
Update for 1.3.0
Merge remote-tracking branch 'upstream/master'