merges upstream/master.

Conflicts:
* bower.json