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