Merge branch 'master' into ranger

This commit is contained in:
Ian Adam Naval 2015-04-21 09:52:57 -04:00
commit a20ec1f2d3