arnauorriols Merge branch 'master' into keep_version_state_in_different_attributes

Latest commit c1ed6d7

Feb 19, 2018