Merged with original at commit ce7f5f5 from Sep 08, 2014

Commit full SHA is ce7f5f584dfc908f03c88565de7f430b36b8454a