Travis CI auto-merge of master from build 833
Travis CI auto-merge of master from build 833

DeepElement/winjs-rocks,DeepElement/winjs-rocks,DeepElement/winjs-rocks,DeepElement/winjsrocks,DeepElement/winjsrocks,DeepElement/winjsrocks