Update to latest linaro release. Clean up code somewhat.
Merge branch 'master' into develop