Sync'd branch releases/aurora with upstream @ Mon Sep 22 15:28:34 PDT 2014