Sync'd branch releases/aurora with upstream @ Mon Sep 15 14:13:26 PDT 2014