Sync'd branch releases/aurora with upstream @ Mon Sep 22 05:07:12 PDT 2014