Merge branch 'master' into ranger

This commit is contained in:
Ian Adam Naval 2015-04-06 03:31:33 -04:00
commit 1a13809331

@ -1 +1 @@
Subproject commit c65c9e96591a16d70fb3c668c25b7d1715ab97ad
Subproject commit 2ca9453edddf5d1448f2c7d61a12f3e21a37cf14