Merge remote-tracking branch 'upstream/master'

Author Brian <brian1461748123@gmail.com>
Author date 2016-07-29 10:59:53
Author local date 2016-07-29 03:59:53 -0700
Committer Brian <brian1461748123@gmail.com>
Committer date 2016-07-29 10:59:53
Committer local date 2016-07-29 03:59:53 -0700
Commit eb9e5afb8edb003626ecf5a04c01fe7acedcea08
Tree d879bc31291360a972b99512894e4abda574509d
Parent c19a953d3c509a123d5ef9ca18a351bcb6aa3095
Parent f9bb9f27fc8fcda1c8d017fdb1e610f8e4dbe127
Merge remote-tracking branch 'upstream/master'
Affected files:
You may download the files in Public Git.