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

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