Rebar 2.2.0

PR's Merged