Fix some bad changes from merging back upstream from master -> release -> development
Fix up links to point to current branch