commit current changes 2013-07-29
Merge remote-tracking branch 'upstream/master' into add_stubs
more stubs