Merge pull request #817 from kraleksandr/v3_0_x

Sync with master branch
This commit is contained in:
sledgehammer999 2013-07-27 07:57:13 -07:00
commit cf301b865c

File diff suppressed because it is too large Load diff