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