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