Merge TantalumMobile:master into adiksonline:master 20140427