Merge upstream and update bower 1.2.6

* merge upstream v79
* update bower to 1.2.6