v3.1.0
eb36410f · Merge branch 'develop' into 'master' · Sep 30, 2015