Merge remote-tracking branch 'origin/master' into binary-cache

Created by  Eelco Dolstra  on February 17, 2016
6EO3HVNAAVJLBYTBSHXQADDTYF7JJU3ANHS5SKHSSROOW4AXIZ4AC
Change contents