* Revert because of missing dependency in bundle
Merge remote-tracking branch 'origin/master'