Merge branch 'fork-367' into develop

This commit is contained in:
theoreticalbts 2015-11-02 10:49:56 -05:00
commit 09855166a2

@ -1 +1 @@
Subproject commit 6495004302239ae0c775f05a0e78780c3b189502
Subproject commit 1e10d3dc4774426e735eb6aabd8e0aa43799fe30