Merge branch 'development' into stage
Merge pull request #2 from abdrus/stage

Merge branch 'development' into stage