merged changes from master since branching
Tyler Riddle [Mon, 15 Oct 2012 17:37:18 +0000 (10:37 -0700)]

Trivial merge