Sync'd branch releases/aurora with upstream @ Mon Sep 29 14:52:39 PDT 2014