Catchup upstream 20140313

For #9