Pulling updates from upstream.

jun 13, 2013 -> oct 8, 2013