Merge pull request #700 from echel0n/dev

Sync master<->dev
This commit is contained in:
echel0n 2014-08-09 01:21:51 -07:00
commit bbc49bb642

File diff suppressed because it is too large Load diff