2013-07-19 before merge

Change-Id: I2b39cf416d09e7fedbdecc4ddf9ccf5e316e4363