merge w master
Merge remote-tracking branch 'origin/master' into vagrant-ubuntu-lts-precise64
merge with raring
Merge commit 'b41efb5'