Merge branch 'develop' into sd-card; this branching scheme is dumb