Merge remote-tracking branch 'upstream/dev' into doco

This commit is contained in:
Andrew Manning 2016-12-06 06:24:59 -05:00
commit 4047e871e5

File diff suppressed because it is too large Load Diff