• Merge branch 'master' into file-select-priority

    @DiegoRBaquero
    DiegoRBaquero committed Jan 3, 2016
    Loading status checks…
    772f02a