Import changes from upstreams 0.7-20141203 release including Raven v3 support