Ruih/merge 2013 10 01

@lorianderson @s-maynard