Update platform v2.1.4 changes.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'
Add branch 2.2

Signed-off-by: crynobone <crynobone@gmail.com>
Setup master branch.

Signed-off-by: crynobone <crynobone@gmail.com>