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