merge local repo with upstream 20-sep-2014