merge from mac 28 sep 2014