Workaround for RELOAD-337.
Merge branch 'OneOne' of github.com:MoSync/Reload into OneOne