Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 13:16:48 PDT 2014