Merges master into dev for build (Wercker, Cap) config