Merge remote-tracking branch 'refs/remotes/origin/master' into Beta-Build

Author Brian <brian1461748123@gmail.com>
Author date 2016-08-10 10:33:14
Author local date 2016-08-10 03:33:14 -0700
Committer Brian <brian1461748123@gmail.com>
Committer date 2016-08-10 10:33:14
Committer local date 2016-08-10 03:33:14 -0700
Commit a066b97c69890cc1cca5a8253134583b52a09ad6
Tree ede6b25cab857b2737d7a1b2c8e0904647c05792
Parent 102f9509e4f38b2478559c40765c0a7a313ae461
Parent 1badf0af2c3e758e0f147064f6559870dc52c80b
Merge remote-tracking branch 'refs/remotes/origin/master' into Beta-Build
Affected files:
You may download the files in Public Git.