Merge remote-tracking branch 'upstream/Beta-Build'

Author Patrick Branch <branch.patrick@gmail.com>
Author date 2016-07-29 14:21:00
Author local date 2016-07-29 10:21:00 -0400
Committer Patrick Branch <branch.patrick@gmail.com>
Committer date 2016-07-29 14:21:00
Committer local date 2016-07-29 10:21:00 -0400
Commit 42b54e24ed9ce314cc345d99cbefe0126c26a037
Tree d2279cdabacc96298f0140ab5c92f585b8729ccb
Parent 560fa156414c2cb83d6bb4473c3146291c818120
Parent 61697a49425db5acb74bea214d5e3a1aed425a45
Merge remote-tracking branch 'upstream/Beta-Build'
Affected files:
You may download the files in Public Git.