Patch Set 5: Looks good to me, but someone else must approve; Build Successful; IP review completed

I was able to successfully install and run that on
- Galileo (3.5)
- Indigo RC4 (3.7)
- E4.1 RC3

Please recheck the version changes I did, should work from 3.5 up to 4.1