merge with master https://github.com/plexinc/roku-client-public 2013-08-16