• Merge branch 'master' into deselect-done-fix

    DiegoRBaquero committed Dec 28, 2015