Lars Brubaker aa7445b618 Merge remote-tracking branch 'origin/1.7' into design_tools ... # Conflicts: # StaticData/Translations/Master.txt		2017-04-11 13:25:42 -07:00
..
agg-sharp@fe9c5f482a	Merge remote-tracking branch 'origin/1.7' into design_tools	2017-04-11 13:25:42 -07:00
MatterSlice@4ec505aff0	Missed on frustum test.	2017-03-23 17:28:46 -07:00