Merge remote-tracking branch 'origin/master' into
rts/multiplatform_support

Change-Id: I1b56c38f17e93740142066301cfb32235891d579
Signed-off-by: Andrew Eidsness <andrewe@jfront.com>