Merge branch 'master' into ranger

This commit is contained in:
Ian Adam Naval 2015-04-09 04:03:34 -04:00
commit a4ad910e09

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