Fix bower issue
Merge commit '8f51ff999de321d92509e69ae9fe21d1574c3cdd'
Fix bower issue