Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 04:18:44 PDT 2014