Sync'd branch releases/beta with upstream @ Mon Sep 22 11:57:33 PDT 2014