Merge updates to master into themes/holo-light branch.

Merging your (@jaunesarmiento) updates as well as my update of fingerblast.js to the master branch into the themes/holo-light branch. Tested for compatibility and verified.