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