Merge remote-tracking branch 'origin/fedora-20' into ubuntu-14.04
Merge remote-tracking branch 'origin/ubuntu-14.04' into arch